From 6779344a8c8a96cfdb90bfd2ccd98f4e303b30c4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20H=C3=A4rdeman?= <david@hardeman.nu>
Date: Fri, 28 Nov 2025 12:43:22 +0100
Subject: [PATCH] statefiles: use tmpfile functions for pio files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reduce code duplication by using the same tmpfile functions
for pio handling as well.

Signed-off-by: David Härdeman <david@hardeman.nu>
Link: https://github.com/openwrt/odhcpd/pull/333
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 src/statefiles.c | 73 ++++++++++++------------------------------------
 src/statefiles.h |  1 +
 2 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/src/statefiles.c b/src/statefiles.c
index 92ff105..3252336 100644
--- a/src/statefiles.c
+++ b/src/statefiles.c
@@ -78,9 +78,16 @@ static void statefiles_finish_tmp_file(int dirfd, FILE **fpp, const char *prefix
 {
 	char *filename;
 
-	if (dirfd < 0 || !fpp || !*fpp || !prefix)
+	if (dirfd < 0 || !fpp || !*fpp)
 		return;
 
+	if (!prefix) {
+		unlinkat(dirfd, ODHCPD_TMP_FILE, 0);
+		fclose(*fpp);
+		*fpp = NULL;
+		return;
+	}
+
 	if (fflush(*fpp))
 		error("Error flushing tmpfile: %m");
 
@@ -159,9 +166,11 @@ static bool statefiles_ra_pio_time(json_object *slaac_json, time_t *slaac_time)
 static json_object *statefiles_load_ra_pio_json(struct interface *iface)
 {
 	json_object *json;
+	char filename[strlen(ODHCPD_PIO_FILE_PREFIX) + strlen(".") + strlen(iface->ifname) + 1];
 	int fd;
 
-	fd = openat(config.ra_piofolder_fd, iface->ifname, O_RDONLY | O_CLOEXEC);
+	sprintf(filename, "%s.%s", ODHCPD_PIO_FILE_PREFIX, iface->ifname);
+	fd = openat(config.ra_piofolder_fd, filename, O_RDONLY | O_CLOEXEC);
 	if (fd < 0)
 		return NULL;
 
@@ -262,67 +271,21 @@ void statefiles_read_prefix_information(struct interface *iface)
 
 static void statefiles_save_ra_pio_json(struct interface *iface, struct json_object *json)
 {
-	size_t tmp_piofile_strlen;
-	char *tmp_piofile;
-	int fd, ret;
-
-	tmp_piofile_strlen = strlen(iface->ifname) + 2;
-	tmp_piofile = alloca(tmp_piofile_strlen);
-	snprintf(tmp_piofile, tmp_piofile_strlen, ".%s", iface->ifname);
-
-	fd = openat(config.ra_piofolder_fd,
-		tmp_piofile,
-		O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
-		0644);
-	if (fd < 0) {
-		error("rfc9096: %s: error %m creating temporary json file",
-		      iface->ifname);
+	FILE *fp;
+
+	fp = statefiles_open_tmp_file(config.ra_piofolder_fd);
+	if (!fp)
 		return;
-	}
 
-	ret = json_object_to_fd(fd, json, JSON_C_TO_STRING_PLAIN);
-	if (ret) {
+	if (json_object_to_fd(fileno(fp), json, JSON_C_TO_STRING_PLAIN)) {
 		error("rfc9096: %s: json write error %s",
 		      iface->ifname,
 		      json_util_get_last_err());
-		close(fd);
-		unlinkat(config.ra_piofolder_fd, tmp_piofile, 0);
-		return;
-	}
-
-	ret = fsync(fd);
-	if (ret) {
-		error("rfc9096: %s: error %m syncing %s",
-		      iface->ifname,
-		      tmp_piofile);
-		close(fd);
-		unlinkat(config.ra_piofolder_fd, tmp_piofile, 0);
-		return;
-	}
-
-	ret = close(fd);
-	if (ret) {
-		error("rfc9096: %s: error %m closing %s",
-		      iface->ifname,
-		      tmp_piofile);
-		unlinkat(config.ra_piofolder_fd, tmp_piofile, 0);
-		return;
-	}
-
-	ret = renameat(config.ra_piofolder_fd,
-		tmp_piofile,
-		config.ra_piofolder_fd,
-		iface->ifname);
-	if (ret) {
-		error("rfc9096: %s: error %m renaming piofile: %s -> %s",
-		      iface->ifname,
-		      tmp_piofile,
-		      iface->ifname);
-		close(fd);
-		unlinkat(config.ra_piofolder_fd, tmp_piofile, 0);
+		statefiles_finish_tmp_file(config.ra_piofolder_fd, &fp, NULL, NULL);
 		return;
 	}
 
+	statefiles_finish_tmp_file(config.ra_piofolder_fd, &fp, ODHCPD_PIO_FILE_PREFIX, iface->ifname);
 	iface->pio_update = false;
 	warn("rfc9096: %s: piofile updated", iface->ifname);
 }
diff --git a/src/statefiles.h b/src/statefiles.h
index a29370d..8b22561 100644
--- a/src/statefiles.h
+++ b/src/statefiles.h
@@ -9,6 +9,7 @@
 #define _STATEFILES_H_
 
 #define ODHCPD_HOSTS_FILE_PREFIX "odhcpd.hosts"
+#define ODHCPD_PIO_FILE_PREFIX "odhcpd.pio"
 #define ODHCPD_TMP_FILE ".odhcpd.tmp"
 
 void statefiles_read_prefix_information(struct interface *iface);
-- 
2.30.2